rhino-build-optional

Gbp-Pq: Name rhino-build-optional.diff

diff --git a/configure.in b/configure.in
index 9b8927b99bf824840a4c19574f1aaea4e2ca3915..90ce592beccfb87c6792309bb59ba48a7dc18b5c 100644 (file)
Binary files a/configure.in and b/configure.in differ

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index e3b9abe6664e7ed6b63adbc8ebd84009bb5f892b..95a57f916fafdf0542ecfd3e023247d92e9d278d 100644 (file)
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -726,13 +726,15 @@ File gid_File_Scripts_Java
     ARCHIVE_TXT_FILE_BODY;
     Name = "ScriptsJava.zip";
 End
-#endif
 
+#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
 File gid_File_Scripts_Javascript
     Dir = gid_Dir_Share_Scripts;
     ARCHIVE_TXT_FILE_BODY;
     Name = "ScriptsJavaScript.zip";
 End
+#endif
+#endif
 
 // new user interface configuration files
 File gid_File_Share_Config_Sofficecfg_uiconfig_Zip

diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index 252a1dfaad8f7bfa7fc41d7574e82ed58b8d38e4..56ceffdc65b596d0d949fff49fcc7036e1d57b8b 100644 (file)
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -52,7 +52,8 @@ $(eval $(call gb_Module_add_targets,scripting,\
        Pyuno_mailmerge \
        Zip_scriptbindinglib \
        Zip_ScriptsBeanShell \
-       Zip_ScriptsJavaScript \
+       $(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),\
+               Zip_ScriptsJavaScript) \
        Zip_ScriptsPython \
 ))
 

diff --git a/scripting/prj/build.lst b/scripting/prj/build.lst
index 2bd4c6139407658324bd0b10a0bf721df927da1b..f8748983e0f139a47d69dfa0d4f9923af1c21059 100644 (file)
--- a/scripting/prj/build.lst
+++ b/scripting/prj/build.lst
@@ -1,2 +1,2 @@
-tc     scripting       :       filter oovbaapi vbahelper bridges DESKTOP:rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
+tc     scripting       :       filter oovbaapi vbahelper bridges DESKTOP:rdbmaker vcl xmlscript basic sfx2 RHINO:rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
 tc     scripting\prj                                           nmake   -       all     tc1_prj NULL

diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 394ac7d67b595b6a0392e5bbdfcdb84d0fdd3bb5..19c6d12a519dde7dcc1d10fdccec63d747d2e788 100644 (file)
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+tb      tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL